*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f2ff14b82d2e51cd177480fb1d839add9156c6e7..4f56d227bd01a192546445e6e7715a091d22c33f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2005-11-27  Luc Teirlinck  <teirllm@auburn.edu>
+
+       * simple.el (blink-matching-open): Ignore
+       `blink-matching-paren-on-screen' if `show-paren-mode' is enabled.
+       Mention this in the docstring.
+
+       * paren.el (show-paren-mode): No longer change
+       `blink-matching-paren-on-screen'.
+
 2005-11-27  John Paul Wallington  <jpw@pobox.com>
 
        * progmodes/gdb-ui.el (gdb-goto-breakpoint, gdb-frames-select)